Latest right now for #conflict resolution